projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
aac6be1
)
src/alloc.c: remove a stray brace
author
Reuben Thomas
<rrt@sc3d.org>
Sat, 9 Aug 2014 21:50:14 +0000
(22:50 +0100)
committer
Reuben Thomas
<rrt@sc3d.org>
Sat, 9 Aug 2014 21:50:14 +0000
(22:50 +0100)
src/ChangeLog
patch
|
blob
|
history
src/alloc.c
patch
|
blob
|
history
diff --git
a/src/ChangeLog
b/src/ChangeLog
index af0589257d81749ce0fd0dba3c8c20d2d59ea7fa..52862bfb446f9caeb9c777696e1e253acd614087 100644
(file)
--- a/
src/ChangeLog
+++ b/
src/ChangeLog
@@
-1,5
+1,6
@@
2014-08-09 Reuben Thomas <rrt@sc3d.org>
+ * alloc.c (Fmemory_info): Remove a stray brace.
* process.c: Fix a comment typo.
* msdos.c:
* dosfns.c (init_dosfns): Remove support for DJGPP < 2.02.
diff --git
a/src/alloc.c
b/src/alloc.c
index a8ad44491fad7f3ba8318a5ed8597d04a1a18288..ac154b587e60503e471c5539cabe00f5cf8db10c 100644
(file)
--- a/
src/alloc.c
+++ b/
src/alloc.c
@@
-6915,7
+6915,6
@@
or memory information can't be obtained, return nil. */)
(uintmax_t) freeswap / 1024);
else
return Qnil;
-}
#else /* not HAVE_LINUX_SYSINFO, not WINDOWSNT, not MSDOS */
/* FIXME: add more systems. */
return Qnil;